# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/07/27 10:16:47-06:00 bjorn.helgaas@hp.com # Merge hp.com:/home/helgaas/linux/to-marcelo-2.4 # into hp.com:/home/helgaas/linux/linux-ia64-2.4 # # drivers/net/tg3.h # 2004/07/27 10:16:46-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # drivers/net/tg3.c # 2004/07/27 10:16:46-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # ChangeSet # 2004/07/27 09:24:22-03:00 zaitcev@redhat.com # [PATCH] USB: update unusual_devs.h # # A usual update from Alan Stern. # # -- Pete # # drivers/usb/storage/unusual_devs.h # 2004/07/26 03:55:00-03:00 zaitcev@redhat.com +10 -1 # Patch for USB in 2.4.27-rc3 to update unusual_devs.h # # ChangeSet # 2004/07/27 09:24:09-03:00 marcelo@logos.cnet # USB: fix endless resubmit in auerswald (Wolfgang Mues) # # drivers/usb/auermain.c # 2004/07/27 09:22:55-03:00 marcelo@logos.cnet +2 -2 # USB: fix endless resubmit in auerswald (Wolfgang Mues) # # ChangeSet # 2004/07/26 19:15:24-03:00 marcelo@logos.cnet # Merge bk://kernel.bkbits.net/davem/net-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # # MAINTAINERS # 2004/07/26 19:15:11-03:00 marcelo@logos.cnet +0 -0 # Auto merged # # ChangeSet # 2004/07/26 19:14:16-03:00 mjc@redhat.com # [PATCH] USB: more sparse fixes # # Back in October 2003 Arnaldo commited some fixes prior to 2.6 for some leaking info to userspace in the # usb drivers: # http://linux.bkbits.net:8080/linux-2.6/cset@3f986b35LyBKc-OxB8G6k22oOjgYTQ # # The corresponding changes have not been commited to 2.4, or included in # the previous sparse fixes. # # drivers/usb/vicam.c # 2004/07/15 08:47:13-03:00 mjc@redhat.com +1 -0 # USB: more sparse fixes # # drivers/usb/serial/io_edgeport.c # 2004/07/15 08:48:06-03:00 mjc@redhat.com +1 -0 # USB: more sparse fixes # # drivers/usb/brlvger.c # 2004/07/15 08:47:27-03:00 mjc@redhat.com +1 -0 # USB: more sparse fixes # # drivers/usb/audio.c # 2004/07/15 08:46:52-03:00 mjc@redhat.com +4 -0 # USB: more sparse fixes # # ChangeSet # 2004/07/24 22:05:10-07:00 kaber@trash.net # [IPV4/IPV6]: Add myself to MAINTAINERS. # # MAINTAINERS # 2004/07/24 22:05:03-07:00 kaber@trash.net +2 -0 # [IPV4/IPV6]: Add myself to MAINTAINERS. # # ChangeSet # 2004/07/22 15:59:56-03:00 geert@linux-m68k.org # [PATCH] M68k Maintainership # # M68k maintainership update: # - Transfer maintainership to Roman and me (ack'ed by Jes and Roman) # - Update main website URL # - Add Linux/m68k CVS repository website # # Signed-off-by: Geert Uytterhoeven # # MAINTAINERS # 2004/07/21 12:26:40-03:00 geert@linux-m68k.org +7 -4 # M68k Maintainership # # ChangeSet # 2004/07/22 15:58:07-03:00 geert@linux-m68k.org # [PATCH] M68k 68060 errata I14 # # M68k: gcc lately manages to generate the code sequence described in the 060 # errata I14, so use the described workaround (from Roman Zippel) # # Signed-off-by: Roman Zippel # Signed-off-by: Geert Uytterhoeven # # arch/m68k/kernel/setup.c # 2004/07/04 16:55:44-03:00 geert@linux-m68k.org +12 -0 # M68k 68060 errata I14 # # ChangeSet # 2004/07/22 15:57:25-03:00 geert@linux-m68k.org # [PATCH] M68k ifpsp060 # # 68060 Integer Support Package: Make sure that the destination address of a # misaligned cas access is properly mapped in, so the kernel won't oops later in # the emulation handler (from Roman Zippel) # # Signed-off-by: Roman Zippel # Signed-off-by: Geert Uytterhoeven # # arch/m68k/ifpsp060/iskeleton.S # 2004/07/04 16:55:43-03:00 geert@linux-m68k.org +48 -5 # M68k ifpsp060 # # ChangeSet # 2004/07/21 21:28:48-07:00 davem@nuts.davemloft.net # [CRYPTO]: No MODULE_ALIAS in 2.4.x # # crypto/tea.c # 2004/07/21 21:28:41-07:00 davem@nuts.davemloft.net +0 -2 # [CRYPTO]: No MODULE_ALIAS in 2.4.x # # ChangeSet # 2004/07/21 21:17:57-07:00 davem@nuts.davemloft.net # [PKT_SCHED]: sch_netem.c needs linux/init.h # # net/sched/sch_netem.c # 2004/07/21 21:17:48-07:00 davem@nuts.davemloft.net +1 -0 # [PKT_SCHED]: sch_netem.c needs linux/init.h # # ChangeSet # 2004/07/21 17:19:55-07:00 davem@nuts.davemloft.net # [ATM]: Update Marko Kiiskila's email address. # # net/atm/lec_arpc.h # 2004/07/21 17:19:48-07:00 davem@nuts.davemloft.net +1 -1 # [ATM]: Update Marko Kiiskila's email address. # # net/atm/lec.h # 2004/07/21 17:19:48-07:00 davem@nuts.davemloft.net +1 -1 # [ATM]: Update Marko Kiiskila's email address. # # net/atm/lec.c # 2004/07/21 17:19:48-07:00 davem@nuts.davemloft.net +1 -1 # [ATM]: Update Marko Kiiskila's email address. # # include/linux/atmlec.h # 2004/07/21 17:19:48-07:00 davem@nuts.davemloft.net +1 -1 # [ATM]: Update Marko Kiiskila's email address. # # ChangeSet # 2004/07/21 16:47:51-07:00 davem@nuts.davemloft.net # [IPV4]: Make raw sockets behave like udp wrt. MSG_TRUNC. # # net/ipv6/raw.c # 2004/07/21 16:47:46-07:00 davem@nuts.davemloft.net +3 -0 # [IPV4]: Make raw sockets behave like udp wrt. MSG_TRUNC. # # net/ipv4/raw.c # 2004/07/21 16:47:46-07:00 davem@nuts.davemloft.net +2 -0 # [IPV4]: Make raw sockets behave like udp wrt. MSG_TRUNC. # # ChangeSet # 2004/07/21 14:52:09-07:00 herbert@gondor.apana.org.au # [CRYPTO]: Fix stack overrun in crypt(). # # The stack allocation in crypt() is bogus as whether tmp_src/tmp_dst # is used is determined by factors unrelated to nbytes and # src->length/dst->length. # # Since the condition for whether tmp_src/tmp_dst are used is very # complex, let's allocate them always instead of guessing. # # This fixes a number of weird crashes including those AES crashes # that people have been seeing with the 2.4 backport + ipt_conntrack. # # Signed-off-by: Herbert Xu # Signed-off-by: James Morris # Signed-off-by: David S. Miller # # crypto/cipher.c # 2004/07/21 14:52:04-07:00 herbert@gondor.apana.org.au +2 -2 # [CRYPTO]: Fix stack overrun in crypt(). # # The stack allocation in crypt() is bogus as whether tmp_src/tmp_dst # is used is determined by factors unrelated to nbytes and # src->length/dst->length. # # Since the condition for whether tmp_src/tmp_dst are used is very # complex, let's allocate them always instead of guessing. # # This fixes a number of weird crashes including those AES crashes # that people have been seeing with the 2.4 backport + ipt_conntrack. # # Signed-off-by: Herbert Xu # Signed-off-by: James Morris # Signed-off-by: David S. Miller # # ChangeSet # 2004/07/21 14:14:28-07:00 davem@nuts.davemloft.net # [TG3]: Update reldate to match 2.6.x sources. # # drivers/net/tg3.c # 2004/07/21 14:14:20-07:00 davem@nuts.davemloft.net +1 -1 # [TG3]: Update reldate to match 2.6.x sources. # # ChangeSet # 2004/07/21 14:13:23-07:00 anton@samba.org # [TG3]: Missing rmb() in rx processing. # # During receive processing, the tg3 card updates rx_producer (the # hardware position in the receive ring) and the opaque cookie. Due to PCI # rules the stores happen in order. However the cpu may reorder the reads. # # In these sort of cases there is usually a data dependency between # reading the index and looking up the data (since we use the index to # load the data). I think all cpus except alpha guarantee the reads # happen in order in this case. # # However in this particular case we load hw_idx, compare it to sw_idx and # then use sw_idx to locate the opaque cookie. There is no data dependency # in this case. We need a read memory barrier between the read of # rx_producer and the opaque cookie to enforce ordering. # # Thanks to Olof Johansson, Michael Chan and Broadcom for their assistance # in finding this bug. # # Signed-off-by: Anton Blanchard # Signed-off-by: Jeff Garzik # Signed-off-by: David S. Miller # # drivers/net/tg3.c # 2004/07/21 14:13:04-07:00 anton@samba.org +5 -0 # [TG3]: Missing rmb() in rx processing. # # During receive processing, the tg3 card updates rx_producer (the # hardware position in the receive ring) and the opaque cookie. Due to PCI # rules the stores happen in order. However the cpu may reorder the reads. # # In these sort of cases there is usually a data dependency between # reading the index and looking up the data (since we use the index to # load the data). I think all cpus except alpha guarantee the reads # happen in order in this case. # # However in this particular case we load hw_idx, compare it to sw_idx and # then use sw_idx to locate the opaque cookie. There is no data dependency # in this case. We need a read memory barrier between the read of # rx_producer and the opaque cookie to enforce ordering. # # Thanks to Olof Johansson, Michael Chan and Broadcom for their assistance # in finding this bug. # # Signed-off-by: Anton Blanchard # Signed-off-by: Jeff Garzik # Signed-off-by: David S. Miller # # ChangeSet # 2004/07/21 13:53:11-07:00 Samuel.Thibault@ens-lyon.fr # [UDP]: Return true length if user specifies MSG_TRUNC. # # net/ipv6/udp.c # 2004/07/21 13:53:06-07:00 Samuel.Thibault@ens-lyon.fr +3 -0 # [UDP]: Return true length if user specifies MSG_TRUNC. # # net/ipv4/udp.c # 2004/07/21 13:53:06-07:00 Samuel.Thibault@ens-lyon.fr +3 -0 # [UDP]: Return true length if user specifies MSG_TRUNC. # # ChangeSet # 2004/07/20 11:51:30-03:00 bunk@fs.tum.de # [PATCH] cmpci oops on rmmod + fix # # Below is a patch originally sent against 2.6 by # Krzysztof Rusocki (and already included # in 2.6.8-rc1). # # His explanation of the patch was: # # <-- snip --> # # The cmpci driver included in Linux 2.6.7 causes an oops on rmmod, # I believe cm_remove should be marked __devexit rather than __devinit. # # <-- snip --> # # This is an obvious bug, and below is my backport of his fix to 2.4 . # While I was editing struct cm_driver, I've also converted it to C99 # initializers (as already done in 2.6). # # # Signed-off-by: Adrian Bunk # # drivers/sound/cmpci.c # 2004/07/17 16:57:22-03:00 bunk@fs.tum.de +5 -5 # cmpci oops on rmmod + fix # # ChangeSet # 2004/07/16 20:08:10+02:00 marcel@holtmann.org # [Bluetooth] Use a signed integer for the RSSI value # # The RSSI value in the inquiry response with RSSI must be a signed # integer and not an unsigned one. # # include/net/bluetooth/hci.h # 2004/07/16 20:07:36+02:00 marcel@holtmann.org +1 -1 # Use a signed integer for the RSSI value # # ChangeSet # 2004/07/16 20:06:59+02:00 marcel@holtmann.org # [Bluetooth] Add support for another ALPS module # # This patch adds the specific vendor and product id's for another # ALPS module which don't uses the USB Bluetooth class id. # # drivers/bluetooth/hci_usb.c # 2004/07/16 20:06:24+02:00 marcel@holtmann.org +6 -5 # Add support for another ALPS module # # ChangeSet # 2004/07/09 07:45:58-05:00 shaggy@austin.ibm.com # JFS: jfs_dmap build fix # # fs/jfs/jfs_dmap.c: In function `dbAllocNear': # fs/jfs/jfs_dmap.c:1343: parse error before `*' # fs/jfs/jfs_dmap.c:1357: `leaf' undeclared (first use in this function) # fs/jfs/jfs_dmap.c:1357: (Each undeclared identifier is reported only once # fs/jfs/jfs_dmap.c:1357: for each function it appears in.) # # Signed-off-by: Andrew Morton # Signed-off-by: Dave Kleikamp # # fs/jfs/jfs_dmap.c # 2004/07/09 07:45:56-05:00 shaggy@austin.ibm.com +2 -1 # build fix # # ChangeSet # 2004/07/07 16:08:21-05:00 shaggy@austin.ibm.com # JFS: Check for dmap corruption before using leafidx # # Signed-off-by: Dave Kleikamp # # fs/jfs/jfs_dmap.c # 2004/07/07 16:08:19-05:00 shaggy@austin.ibm.com +34 -0 # Check for dmap corruption before using leafidx # # ChangeSet # 2004/07/07 15:58:38-05:00 shaggy@austin.ibm.com # JFS: prevent concurrent calls to txCommit on the imap inode # # Signed-off-by: Dave Kleikamp # # fs/jfs/jfs_imap.c # 2004/07/07 15:58:36-05:00 shaggy@austin.ibm.com +6 -0 # Don't allow diFree & diNewIAG to call txCommit at the same time # # ChangeSet # 2004/07/07 15:39:12-05:00 shaggy@austin.ibm.com # JFS: Protect active_ag with a spinlock # # Signed-off-by: Dave Kleikamp # # fs/jfs/super.c # 2004/07/07 15:39:08-05:00 shaggy@austin.ibm.com +1 -0 # protect active_ag with a spinlock # # fs/jfs/jfs_incore.h # 2004/07/07 15:39:08-05:00 shaggy@austin.ibm.com +1 -0 # protect active_ag with a spinlock # # fs/jfs/jfs_extent.c # 2004/07/07 15:39:08-05:00 shaggy@austin.ibm.com +2 -0 # protect active_ag with a spinlock # # fs/jfs/inode.c # 2004/07/07 15:39:08-05:00 shaggy@austin.ibm.com +3 -0 # protect active_ag with a spinlock # # fs/jfs/file.c # 2004/07/07 15:39:08-05:00 shaggy@austin.ibm.com +4 -0 # protect active_ag with a spinlock # # ChangeSet # 2004/07/06 08:35:07-05:00 shaggy@austin.ibm.com # JFS: Updated field isn't always written to disk during truncate # # There is a possibility that a change to header.next is not logged # or written to disk if it is the only change to an xtree leaf page. # # Signed-off-by: Dave Kleikamp # # fs/jfs/jfs_xtree.c # 2004/07/06 08:35:05-05:00 shaggy@austin.ibm.com +11 -1 # Make sure header.next change is logged & writtenMake sure header.next change is logged & written # # ChangeSet # 2004/07/05 15:53:10-07:00 davem@nuts.davemloft.net # [TG3]: Bump driver version and reldate. # # drivers/net/tg3.c # 2004/07/05 15:53:02-07:00 davem@nuts.davemloft.net +2 -2 # [TG3]: Bump driver version and reldate. # # ChangeSet # 2004/07/05 15:52:35-07:00 davem@nuts.davemloft.net # [TG3]: Delay both before and after PCI cfg space readback after reset. # # drivers/net/tg3.c # 2004/07/05 15:52:28-07:00 davem@nuts.davemloft.net +17 -1 # [TG3]: Delay both before and after PCI cfg space readback after reset. # # ChangeSet # 2004/07/02 09:07:45-07:00 davem@nuts.davemloft.net # [TG3]: Update driver version and reldate. # # drivers/net/tg3.c # 2004/07/02 09:07:40-07:00 davem@nuts.davemloft.net +2 -2 # [TG3]: Update driver version and reldate. # # ChangeSet # 2004/07/02 09:04:53-07:00 davem@nuts.davemloft.net # [TG3]: Fibre PHY fixes from Sun. # # - Support HW autoneg on 5704. # - On serdes, no MII reg ioctl support. # # drivers/net/tg3.h # 2004/07/02 09:04:40-07:00 davem@nuts.davemloft.net +47 -2 # [TG3]: Fibre PHY fixes from Sun. # # - Support HW autoneg on 5704. # - On serdes, no MII reg ioctl support. # # drivers/net/tg3.c # 2004/07/02 09:04:40-07:00 davem@nuts.davemloft.net +114 -45 # [TG3]: Fibre PHY fixes from Sun. # # - Support HW autoneg on 5704. # - On serdes, no MII reg ioctl support. # # ChangeSet # 2004/06/30 15:46:19-05:00 shaggy@austin.ibm.com # JFS: Error path released metadata page it shouldn't have # # Signed-off-by: Dave Kleikamp # # fs/jfs/jfs_xtree.c # 2004/06/30 15:46:16-05:00 shaggy@austin.ibm.com +8 -17 # Remove extra XT_PUTPAGE(rcmp) on err path # # ChangeSet # 2004/06/16 11:40:18-07:00 davem@nuts.davemloft.net # [TG3]: Always do 4gb tx dma test, and fix the test. # # Based upon a patch from Sun. # # drivers/net/tg3.c # 2004/06/16 11:40:07-07:00 davem@nuts.davemloft.net +4 -167 # [TG3]: Always do 4gb tx dma test, and fix the test. # # Based upon a patch from Sun. #